fix: support else blocks with ! return type in convert_to_guarded_return
#20758
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
S-waiting-on-review
A4-Tacks
force-pushed
the
guarded-if-let-else
branch
from
0f18d92 to
42142f7
Compare
| // if !cond { | ||
| // return; | ||
| // } | ||
| // if !cond { return } |
There was a problem hiding this comment.
Looks good overall but I think we'd prefer the former return; stmt over { return } as rustfmt does so
There was a problem hiding this comment.
This will make it more compact in let-chain
Add support for else-block of never-type for `convert_to_guarded_return`
Example
---
```rust
fn main() {
if$0 let Ok(x) = Err(92) {
foo(x);
} else {
return
}
}
```
**Before this PR**:
Assist not applicable
**After this PR**:
```rust
fn main() {
let Ok(x) = Err(92) else {
return
};
foo(x);
}
```
A4-Tacks
force-pushed
the
guarded-if-let-else
branch
from
589f157 to
3b5e529
Compare
|
@ShoyuVanilla Do you have time to review this PR and some older PRs? |
|
Yes, but one or two days later. I have to fix some cargo related issues as they worsen developer experiences for some people by a lot 😅 |
|
But I'll review some relatively simple PRs before then |
ShoyuVanilla
approved these changes
Oct 14, 2025
rustbot
removed
the
S-waiting-on-review
lnicola
changed the title
else blocks with ! return type in convert_to_guarded_return
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add support for else-block of never-type for
convert_to_guarded_returnExample
Before this PR:
Assist not applicable
After this PR: